Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[MDS] Adds datasource filter for version decoupling #2051

Merged
merged 6 commits into from
Jul 23, 2024
Merged

[MDS] Adds datasource filter for version decoupling #2051

merged 6 commits into from
Jul 23, 2024

Conversation

DarshitChanpura
Copy link
Member

@DarshitChanpura DarshitChanpura commented Jul 23, 2024 •
edited
Loading

Description

This change adds a datasource filter function to allow for version decoupling for MDS feature.

Category

Enhancement

Why these changes are required?

To allow for version decoupling in MDS.

What is the old behavior before changes and new behavior after changes?

Before: Datasources with all versions were shown.
After: Datasource with only compatible versions are shown.

Issues Resolved

Testing

Unit tests

Check List

  • New functionality includes testing
    - [ ] New functionality has been documented
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@DarshitChanpura DarshitChanpura added backport 2.x backport to 2.x branch v2.16.0 labels Jul 23, 2024
@codecov Codecov
Copy link

codecov bot commented Jul 23, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 69.46%. Comparing base (a44e265) to head (df825d7).

Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #2051      +/-   ##
==========================================
+ Coverage   69.34%   69.46%   +0.11%     
==========================================
  Files          96       96              
  Lines        2587     2597      +10     
  Branches      375      386      +11     
==========================================
+ Hits         1794     1804      +10     
  Misses        699      699              
  Partials       94       94

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@DarshitChanpura
Adds test for dataSource filter
78a99c1 
Signed-off-by: Darshit Chanpura <[email protected]>
@DarshitChanpura DarshitChanpura marked this pull request as ready for review July 23, 2024 18:43
@DarshitChanpura DarshitChanpura self-assigned this Jul 23, 2024
@DarshitChanpura DarshitChanpura changed the title Adds datasource filter for version decoupling in MDS [MDS] Adds datasource filter for version decoupling Jul 23, 2024
derek-ho
derek-ho requested changes Jul 23, 2024
View reviewed changes
Copy link
Collaborator

@derek-ho derek-ho left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comment: https://github.com/opensearch-project/security-dashboards-plugin/pull/2051/files#r1688545956

@DarshitChanpura
Adds semver as a local dependency
f6cc070 
Signed-off-by: Darshit Chanpura <[email protected]>
@DarshitChanpura
Copy link
Member Author

DarshitChanpura commented Jul 23, 2024 •
edited
Loading

See comment: https://github.com/opensearch-project/security-dashboards-plugin/pull/2051/files#r1688545956

#2051 (comment)

addressed to unblock this PR.

derek-ho
derek-ho approved these changes Jul 23, 2024
View reviewed changes
Copy link
Collaborator

@derek-ho derek-ho left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does the yarn.lock need to be updated?

cwperks
cwperks previously approved these changes Jul 23, 2024
View reviewed changes
derek-ho
derek-ho previously requested changes Jul 23, 2024
View reviewed changes
Copy link
Collaborator

@derek-ho derek-ho left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets take a look at the cypress failures for MDS to make sure there are no regressions prior to merging

@DarshitChanpura
Updates yarn.lock
6c1fbda 
Signed-off-by: Darshit Chanpura <[email protected]>
@DarshitChanpura
Fixes cypress tests
c1e173c 
Signed-off-by: Darshit Chanpura <[email protected]>
@DarshitChanpura DarshitChanpura dismissed stale reviews from cwperks and stephen-crawford via c1e173c July 23, 2024 21:20
@cwperks cwperks added the backport 2.16 backport to 2.16 branch label Jul 23, 2024
cwperks
cwperks previously approved these changes Jul 23, 2024
View reviewed changes
@DarshitChanpura
Adds dataSourceVersion
df825d7 
Signed-off-by: Darshit Chanpura <[email protected]>
@DarshitChanpura DarshitChanpura dismissed stale reviews from cwperks and stephen-crawford via df825d7 July 23, 2024 21:40
@prudhvigodithi prudhvigodithi mentioned this pull request Jul 23, 2024
Closed
74 tasks
@DarshitChanpura DarshitChanpura dismissed derek-ho’s stale review July 23, 2024 23:33

Changes have been addressed. MDS cypress tests are no longer failing.

@DarshitChanpura DarshitChanpura merged commit e9609ac into opensearch-project:main Jul 23, 2024
18 of 19 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-2051-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e9609acc76e7db541eb3701bd53369555a98517c
# Push it to GitHub
git push --set-upstream origin backport/backport-2051-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-2051-to-2.x.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.16 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.16 2.16
# Navigate to the new working tree
cd .worktrees/backport-2.16
# Create a new branch
git switch --create backport/backport-2051-to-2.16
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e9609acc76e7db541eb3701bd53369555a98517c
# Push it to GitHub
git push --set-upstream origin backport/backport-2051-to-2.16
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.16

Then, create a pull request where the base branch is 2.16 and the compare/head branch is backport/backport-2051-to-2.16.

DarshitChanpura added a commit to DarshitChanpura/security-dashboards-plugin that referenced this pull request Jul 23, 2024
@DarshitChanpura
[MDS] Adds datasource filter for version decoupling (opensearch-proje…
37de149 
…ct#2051)

---------

Signed-off-by: Darshit Chanpura <[email protected]>
(cherry picked from commit e9609ac)
@DarshitChanpura DarshitChanpura mentioned this pull request Jul 23, 2024
Merged
3 tasks
DarshitChanpura added a commit to DarshitChanpura/security-dashboards-plugin that referenced this pull request Jul 23, 2024
@DarshitChanpura
[MDS] Adds datasource filter for version decoupling (opensearch-proje…
eb25d83 
…ct#2051)

---------

Signed-off-by: Darshit Chanpura <[email protected]>
(cherry picked from commit e9609ac)
@DarshitChanpura DarshitChanpura mentioned this pull request Jul 23, 2024
Merged
3 tasks
DarshitChanpura added a commit that referenced this pull request Jul 24, 2024
@DarshitChanpura
[MDS] Adds datasource filter for version decoupling (#2051) (#2053)
907a574 
---------

Signed-off-by: Darshit Chanpura <[email protected]>
(cherry picked from commit e9609ac)
DarshitChanpura added a commit that referenced this pull request Jul 24, 2024
@DarshitChanpura
[MDS] Adds datasource filter for version decoupling (#2051) (#2052)
0c0ffc3 
---------

Signed-off-by: Darshit Chanpura <[email protected]>
(cherry picked from commit e9609ac)
@DarshitChanpura DarshitChanpura deleted the dataSource-filter branch July 24, 2024 14:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RyanL1997 RyanL1997 RyanL1997 approved these changes

@ZilongX ZilongX ZilongX approved these changes

@cwperks cwperks cwperks approved these changes

@stephen-crawford stephen-crawford stephen-crawford left review comments

@derek-ho derek-ho derek-ho left review comments

@cliu123 cliu123 Awaiting requested review from cliu123

Assignees

@DarshitChanpura DarshitChanpura

Labels
backport 2.x backport to 2.x branch backport 2.16 backport to 2.16 branch v2.16.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[FEATURE] Support Version Decoupling in Security Dashboards Plugin
6 participants
@DarshitChanpura @cwperks @derek-ho @stephen-crawford @ZilongX @RyanL1997